Skip to content

websocket: correct shutdown#7162

Merged
kingthorin merged 1 commit intozaproxy:mainfrom
thc202:websocket/shutdown
Feb 24, 2026
Merged

websocket: correct shutdown#7162
kingthorin merged 1 commit intozaproxy:mainfrom
thc202:websocket/shutdown

Conversation

@thc202
Copy link
Copy Markdown
Member

@thc202 thc202 commented Feb 24, 2026

Do not attempt to stop the passive scanner and unregister the event publisher more than once.

Prevent, e.g.:

[ZAP-Shutdown] INFO  WebSocketPassiveScannerManager - Passive scan thread had already been closed
[ZAP-Shutdown] ERROR ExtensionLoader - Publisher with name org.zaproxy.zap.extension.websocket.WebSocketEventPublisher not registered
java.security.InvalidParameterException: Publisher with name org.zaproxy.zap.extension.websocket.WebSocketEventPublisher not registered
	at org.zaproxy.zap.eventBus.SimpleEventBus.unregisterPublisher(SimpleEventBus.java:127)
	at org.zaproxy.zap.extension.websocket.WebSocketEventPublisher.shutdown(WebSocketEventPublisher.java:142)
	at org.zaproxy.zap.extension.websocket.ExtensionWebSocket.stop(ExtensionWebSocket.java:500)
	at org.parosproxy.paros.extension.ExtensionLoader.stopAllExtension(ExtensionLoader.java:927)
	at org.parosproxy.paros.control.AbstractControl.shutdown(AbstractControl.java:71)
	at org.parosproxy.paros.control.Control.shutdown(Control.java:220)
	at org.parosproxy.paros.control.Control$1.run(Control.java:300)
	at java.base/java.lang.Thread.run(Unknown Source)

@thc202
websocket: correct shutdown
fb501b9 
Do not attempt to stop the passive scanner and unregister the event
publisher more than once.

Signed-off-by: thc202 <thc202@gmail.com>
@psiinon
Copy link
Copy Markdown
Member

psiinon commented Feb 24, 2026

Logo
Checkmarx One – Scan Summary & Details – 0e8e26b3-8eab-42ba-803a-c9400ac89f8d

Great job! No new security vulnerabilities introduced in this pull request

Use @Checkmarx to interact with Checkmarx PR Assistant.
Examples:
@Checkmarx how are you able to help me?
@Checkmarx rescan this PR

@kingthorin kingthorin merged commit f669ec3 into zaproxy:main Feb 24, 2026
10 checks passed
@github-actions github-actions Bot locked and limited conversation to collaborators Feb 24, 2026
@thc202 thc202 deleted the websocket/shutdown branch February 24, 2026 11:17
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@psiinon psiinon psiinon approved these changes

@kingthorin kingthorin kingthorin approved these changes

Assignees

No one assigned

Labels

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@thc202 @psiinon @kingthorin